gnomeos: Drop ostree-init module

We use dracut+ostree-switch-root now

diff --git a/gnomeos/3.4/manifest.json b/gnomeos/3.4/manifest.json
index ca759ace1057996936918d12061a4fb92a18d209..3c42650c7c5bef71652a1c4866c009c390d9dcef 100644 (file)
--- a/gnomeos/3.4/manifest.json
+++ b/gnomeos/3.4/manifest.json
@@ -49,8 +49,6 @@
 
                {"src": "gnome:linux-user-chroot"},
 
-               {"src": "gnome:ostree-init"},
-
                {"src": "gnome:ostree",
                 "config-opts": ["--disable-documentation"]},
 

diff --git a/gnomeos/yocto/15_ostree b/gnomeos/yocto/15_ostree
index d67cf444417bb6b4524a3330ceeeea82decdac2b..554e0bc3c66cf131288bfde6e3a8f9c24acb535c 100755 (executable)
--- a/gnomeos/yocto/15_ostree
+++ b/gnomeos/yocto/15_ostree
@@ -28,7 +28,7 @@ EOF
 
   cat <<EOF
        echo '"Loading ${os} ${version}"'
-       linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro init=/ostree/ostree-init ${args}
+       linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ostree=current ${args}
 EOF
   if test -n "${initrd}" ; then
     message="$(gettext_printf "Loading initial ramdisk ...")"

diff --git a/gnomeos/yocto/gnomeos-install.sh b/gnomeos/yocto/gnomeos-install.sh
index 85de0d6a31378be8c7ce0ee7c3f5fd88b14bb2bc..08832cb1c75c023640cd5a0b830d5cfc8d33c075 100755 (executable)
--- a/gnomeos/yocto/gnomeos-install.sh
+++ b/gnomeos/yocto/gnomeos-install.sh
@@ -70,7 +70,6 @@ done
 rm -f current
 ln -s ${BRANCH_PREFIX}runtime-current current
 
-cp -a ./${BRANCH_PREFIX}${branch}-current/usr/sbin/ostree-init .
 cd -
 
 if test -d /etc/grub.d; then